Aligning with the Official Community Plan