Added Handler
Refactoring: Creating ElementHandler instead of many HandleElement methods