Further improved Docker and json conversion