Adding back core engine functionality