Added timeouts to catapult commands.