Adding support for docker