Added "ClassRegistry" for manual class registration