Added support for polari and corebird