Add Singleton getters & setters