Changed to using singleton object for Defaults