Simplify alias data model and fix overwriting existing alias