Refactored statuses to allow new kind of statuses