Updates to form validation, base Model, base Category