JOJ-87 - Extended controller and helper to cover single and multi-cell spatial extents