Fix for required columns and used Entity.className instead of a string parse