Added more validation specific to the engine