Refactored handler interface location, and added javadoc