Added alias support in mapping relationships