Added support for prefixes