Add suffix support