Static handler added. Naming refactorings.