Finalized adding classes