Updating components to expect $ and container