Add location to models
Move tags to assets