Accommodate new component locations