Some changes and more alias integration