Feature/refactor/keystone