Updated component loading/structure