Removed the attr_accessors as its now a static class