added support for extracts and labeled extracts