Made auto and Catapult compatible