Moved component factory api to be the first argument instead of the last. Containers now work correctly.