Storing ID's in DB, changing key to service ID, fixing glue code