Added support for alternative prefix chars