Added in some more aliases