singularized entity names
added enum select options