Add EntityClass & Specialization + Cleanup