Refactor Key into a POCO