Add more fields
Implement even escalation to next level