Moved instantiator to own namespace