Added suffix alias handling