Remove Lazy attribute, adding Singleton attribute