Made command aliasing more robust