Added index to users and more validations