This shouldn't go here.  As mentioned on the other pull request, you should use a MappingHandler for this.