Changed parameters to a proper singleton and modified accessors accordingly