Fixing #44 - generated hydrator now follows the interface's specified return type