Asset registration and location refactor