Changed Singleton Dependency macro and tweaked DM
Switched to auto and changed macro