Add suffix awareness to plugin defined type