Re-added validation constraints