Added support for @ characters in model names, moved long ids to @location, and introduced short ids