Updated to support docker