Added location management