Add LazyLocation for future use