Config logic moved to controller. Removed row breaking.