Updated component building order