Change singleton/prototype recognition