Updated Engine and Interface class