Fix class skeleton