Adding support for function containers.