Refactor UriAwareIDentifierConverter