Add keystone helper
Helpers refactor