Improved the engine authorization