added fields for production environment
added validation for fields