#7. Added more constraints for DB fields.