Added alias support