Added support for the catapult expansion