Refactored handlers
Removed firstWorldLoad property