Working on docker integration