Added support for unpublished