Better docker integration