Added support for different prefixes