Refactored out hard coded keys