added statuses handling