Update Sector and SectorRepository to take advantage of Java 8