Fixes for engine refactor
Refactored for new event methods