Fixing build
Refactoring some of the keys