#3 Support for docker implementation (in progress)