Add support for status checking