Changed status to a defined list of values, added some validation