Added more fields + color + validations