Updated component locations