Updated models to follow new validation pattern