Updated models with better display names and data type attributes/validation