Added classes and made methods corresponding classmethods for core modules