Refactor to key value instead of login name