Feature/alias field