Add data validation
Add unique and nonnull data validation