Update for alias handling