Design improvements using Kube, refactor