Add finished super and sub classes