Fixed weird bug that resets the status.
Added missing enums