Fixes #24 - Remove @Handler