Change done to status
Add validations for status