Update entity to conform with latest state diagram