Changed class to object, for easy access