Need mast step and mast base current part numbers

I'm looking to replace my mast step and mast base (worn out rotation stops) on my 2001 H16 with the current generation parts. Anyone confident of the up-to-date part numbers?

Thanks

Easily found here:

http://cdn.hobiecat.com/digital_assets/ ... atalog.pdf

Thanks for the link but I don't fully trust the Hobie catalog. Example: I ordered a replacement H16 forestay via the catalog and what I got was something that fit my 1980's era boats not my 2001 era boat. The replacement forestay length was far shorter than what was original on my 2001 boat.

I see that the newest boats have a mast cup designed to allow more mast rake than my 2001 boat, plus the rotation stops are more robust. So, are the following part numbers the latest?
Mast Step: H16 BLACK MAST STEP 20200011
Mast Base: H16 BLACK 20640011

Thanks again.