Improve Singleton accessors

Singleton accessors can now be called either as class or instance methods

Change-Id: I9cbdb9480fa3d8d3465b36042f447567a8aad21e