Fix class stucture