Add support for multi-prefix