Added suffix support