Added alias support
Modified alises to allow modification