Add remaining missing prefix support.