More changes, additional aliases