Issue#56 - replaced Handler.create with builder-calls + refactoring

resolves #56