Persistence over sets of locations
Javadoc cleanup