Refactored in new enum SubCell
Fixes #6068 & #4605