Adding table groups and routing