Add support for local catapult