Improved Dockerfile