Added improved aliases