Updated to address alias issues