Updated most of MAPI

Few classes need to updated, including the Stonecutter stuff.