Rework code for handle alias