Changed class layout/structure