Add suffix support.