Incremental docker class improvements