Cleaned up ElementHandlerWrapper to be simpler