Added support for smart category identifiers. Not done