Changes to prototype and neighborhood map