Auto instantiated classes will now return the instance