Added support for more task status