Added and modified some aliases