Added dynamic starter location retrieval