Adding support for the function containers.