gk as a service stattes refactoring