Add smarter maas entity usage + change server names