New aliases added and more