Added Location and LocationGenerator classes