Add support for statuses