Now adding more specific statuses instead of active/inactive