Refactor handler specification for location node