Sped up make, moved slot inheritance to class macro