More refactory in support of class based Actor registry and revised resolve methodology