Implemented engine instance refactor