updated models to reflect unique and non-blank fields