Minor refactor
Added PointPopping generator.