[ADD] Element location management