Add keys module
Add HTTP PUT method to the api handler
Resolve merge conflict