Adding padding for cluster assignment
Flat data structure, so it's clunky but might work.