diff --git a/demo/fit_a_line/train.py b/demo/fit_a_line/train.py
new file mode 100644
index 00000000..8449e456
--- /dev/null
+++ b/demo/fit_a_line/train.py
@@ -0,0 +1,49 @@
+import paddle.v2 as paddle
+import pcloud.dataset.uci_housing as uci_housing
+
+def main():
+    # init
+    paddle.init()
+
+    # network config
+    x = paddle.layer.data(name='x', type=paddle.data_type.dense_vector(13))
+    y_predict = paddle.layer.fc(input=x, size=1, act=paddle.activation.Linear())
+    y = paddle.layer.data(name='y', type=paddle.data_type.dense_vector(1))
+    cost = paddle.layer.mse_cost(input=y_predict, label=y)
+
+    # create parameters
+    parameters = paddle.parameters.create(cost)
+
+    # create optimizer
+    optimizer = paddle.optimizer.Momentum(momentum=0)
+
+    trainer = paddle.trainer.SGD(
+        cost=cost, parameters=parameters, update_equation=optimizer)
+
+    feeding = {'x': 0, 'y': 1}
+
+    # event_handler to print training and testing info
+    def event_handler(event):
+        if isinstance(event, paddle.event.EndIteration):
+            if event.batch_id % 100 == 0:
+                print "Pass %d, Batch %d, Cost %f" % (
+                    event.pass_id, event.batch_id, event.cost)
+
+        if isinstance(event, paddle.event.EndPass):
+            result = trainer.test(
+                reader=paddle.batch(uci_housing.test(), batch_size=2),
+                feeding=feeding)
+            print "Test %d, Cost %f" % (event.pass_id, result.cost)
+
+    # training
+    trainer.train(
+        reader=paddle.batch(
+            paddle.reader.shuffle(uci_housing.train(), buf_size=500),
+            batch_size=2),
+        feeding=feeding,
+        event_handler=event_handler,
+        num_passes=30)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/docker/.gitignore b/docker/.gitignore
new file mode 100644
index 00000000..f3c1a937
--- /dev/null
+++ b/docker/.gitignore
@@ -0,0 +1,3 @@
+Dockerfile
+*.pyc
+pcloud.egg-info
diff --git a/docker/cloud-job/README.md b/docker/README.md
similarity index 100%
rename from docker/cloud-job/README.md
rename to docker/README.md
diff --git a/docker/cloud-job/build_docker.sh b/docker/build_docker.sh
similarity index 64%
rename from docker/cloud-job/build_docker.sh
rename to docker/build_docker.sh
index 00f2f1cb..ba825c29 100755
--- a/docker/cloud-job/build_docker.sh
+++ b/docker/build_docker.sh
@@ -18,12 +18,20 @@ fi
 echo "base_image": $base_image
 echo "pcloudjob_image": $pcloudjob_image
 
+#Build Python Package
+docker run --rm -it -v $PWD:/cloud $base_image \
+  bash -c "cd /cloud/python && python setup.py bdist_wheel"
+
 #Build Docker Image
 cat > Dockerfile <<EOF
 FROM ${base_image}
 RUN pip install -U kubernetes && apt-get install -y iputils-ping
 ADD ./paddle_k8s /usr/bin
 ADD ./k8s_tools.py /root/
+ADD ./python/dist/pcloud-0.1.1-py2-none-any.whl /tmp/
+#RUN pip install /tmp/pcloud-0.1.1-py2-none-any.whl && \
+#  rm /tmp/pcloud-0.1.1-py2-none-any.whl
+RUN pip install /tmp/pcloud-0.1.1-py2-none-any.whl 
 
 CMD ["paddle_k8s"]
 EOF
diff --git a/docker/cloud-job/.gitignore b/docker/cloud-job/.gitignore
deleted file mode 100644
index 94143827..00000000
--- a/docker/cloud-job/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile
diff --git a/docker/cloud-job/k8s_tools.py b/docker/k8s_tools.py
similarity index 100%
rename from docker/cloud-job/k8s_tools.py
rename to docker/k8s_tools.py
diff --git a/docker/cloud-job/paddle_k8s b/docker/paddle_k8s
similarity index 100%
rename from docker/cloud-job/paddle_k8s
rename to docker/paddle_k8s
diff --git a/docker/prepare_dataset/Dockerfile b/docker/prepare_dataset/Dockerfile
deleted file mode 100644
index 18f9d51f..00000000
--- a/docker/prepare_dataset/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM paddlepaddle/paddle:latest
-RUN python -c "import paddle.v2.dataset.common as common; common.fetch_all()"
-ADD ./prepare.py /root/
-CMD ["python", "/root/prepare.py"]
diff --git a/docker/prepare_dataset/prepare.py b/docker/prepare_dataset/prepare.py
deleted file mode 100644
index 2e918d59..00000000
--- a/docker/prepare_dataset/prepare.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import paddle.v2.dataset as dataset
-import shutil
-import os
-dataset_home = os.getenv("DATASET_HOME")
-os.system("mv %s %s" % (dataset.common.DATA_HOME, dataset_home))
-
-dataset.common.DATA_HOME = dataset_home
-dataset.common.split(dataset.uci_housing.train(),
-                    line_count = 500,
-                    suffix=dataset_home + "/uci_housing/train-%05d.pickle")
-dataset.common.split(dataset.mnist.train(),
-                    line_count = 500,
-                    suffix=dataset_home + "/mnist/train-%05d.pickle")
-dataset.common.split(dataset.cifar.train10(),
-                    line_count = 500,
-                    suffix=dataset_home + "/cifar/train10-%05d.pickel")
-
-N = 5
-word_dict = dataset.imikolov.build_dict()
-dict_size = len(word_dict)
-dataset.common.split(dataset.imikolov.train(word_dict, 5),
-                    line_count = 500,
-                    suffix = dataset_home + "/imikolov/train-%05d.pickle")
-
-dataset.common.split(dataset.movielens.train(),
-                    line_count = 500,
-                    suffix = dataset_home + "/movielens/train-%05d.pickle")
-
-dataset.common.split(lambda: dataset.imdb.train(dataset.imdb.word_dict()),
-                    line_count = 500,
-                    suffix = dataset_home + "/imdb/train-%05d.pickle")
-
-dataset.common.split(dataset.conll05.test(),
-                    line_count = 500,
-                    suffix = dataset_home + "/conll05/test-%05d.pickle")
-
-dataset.common.split(dataset.wmt14.train(30000),
-                    line_count = 500,
-                    suffix = dataset_home + "wmt14/train-%05d.pickle")
diff --git a/docker/python/.gitignore b/docker/python/.gitignore
new file mode 100644
index 00000000..6303b627
--- /dev/null
+++ b/docker/python/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+paddlecloud.egg-info
diff --git a/docker/python/pcloud/__init__.py b/docker/python/pcloud/__init__.py
new file mode 100644
index 00000000..7e381fb3
--- /dev/null
+++ b/docker/python/pcloud/__init__.py
@@ -0,0 +1 @@
+__all__ = ["dataset"]
diff --git a/docker/python/pcloud/dataset/__init__.py b/docker/python/pcloud/dataset/__init__.py
new file mode 100644
index 00000000..ef87c8f9
--- /dev/null
+++ b/docker/python/pcloud/dataset/__init__.py
@@ -0,0 +1,3 @@
+import uci_housing
+import common
+__all__ = ["uci_housing", "common"]
diff --git a/docker/python/pcloud/dataset/common.py b/docker/python/pcloud/dataset/common.py
new file mode 100644
index 00000000..a01e697d
--- /dev/null
+++ b/docker/python/pcloud/dataset/common.py
@@ -0,0 +1,11 @@
+import uci_housing
+import paddle
+import importlib
+def fetch_all():
+    for module_name in filter(lambda x: not x.startswith("__"),
+                              dir(paddle.cloud.dataset)):
+        if "fetch" in dir(
+                importlib.import_module("pcloud.dataset.%s" % module_name)):
+            getattr(
+                importlib.import_module("pcloud.dataset.%s" % module_name),
+                "fetch")()
diff --git a/docker/python/pcloud/dataset/uci_housing.py b/docker/python/pcloud/dataset/uci_housing.py
new file mode 100644
index 00000000..cded2408
--- /dev/null
+++ b/docker/python/pcloud/dataset/uci_housing.py
@@ -0,0 +1,31 @@
+import paddle.v2.dataset.uci_housing as uci_housing
+import paddle.v2.dataset.common as common
+import os
+
+__all__=["train", "test", "fetch"]
+
+dc = os.getenv("PADDLE_CLOUD_CURRENT_DATACENTER")
+
+#The default public directory on PaddleCloud is /pfs/${DATACENTER}/public/
+common.DATA_HOME = "/pfs/%s/public/dataset" % dc
+
+TRAIN_FILES_PATTERN = os.path.join(common.DATA_HOME,
+                                   "uci_housing/train-*.pickle")
+TRAIN_FILES_SUFFIX = os.path.join(common.DATA_HOME,
+                                  "uci_housing/train-%05d.pickle")
+
+
+def train():
+    return common.cluster_files_reader(
+        TRAIN_FILES_PATTERN,
+        trainer_count = int(os.getenv("PADDLE_INIT_NUM_GRADIENT_SERVERS", "1")),
+        trainer_id = int(os.getenv("PADDLE_INIT_TRAINER_ID", "0")))
+
+def test():
+    return uci_housing.test()
+
+def fetch():
+    print "fetch cluster files: %s" % TRAIN_FILES_SUFFIX
+    common.split(uci_housing.train(),
+                 line_count = 500,
+                 suffix=TRAIN_FILES_SUFFIX)
diff --git a/docker/python/setup.py b/docker/python/setup.py
new file mode 100644
index 00000000..c6f8c814
--- /dev/null
+++ b/docker/python/setup.py
@@ -0,0 +1,11 @@
+from setuptools import setup
+
+packages=[
+  'pcloud',
+  'pcloud.dataset']
+
+setup(name='pcloud',
+      version='0.1.1',
+      description="PaddlePaddle Cloud",
+      packages=packages
+)
diff --git a/k8s/prepare_dataset.yaml b/k8s/prepare_dataset.yaml
index bceed77c..a7036a7e 100644
--- a/k8s/prepare_dataset.yaml
+++ b/k8s/prepare_dataset.yaml
@@ -1,11 +1,11 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: paddle-prepare
+  name: prepare-dataset
 spec:
   template:
     metadata:
-      name: paddle-prepare
+      name: prepare-dataset
     spec:
       volumes:
         - name: data-storage
@@ -18,11 +18,12 @@ spec:
               name: ceph-secret
       containers:
       - name: prepare
-        image: yancey1989/paddlecloud-prepare
+        image: yancey1989/paddlecloud-job
         env:
-          - name: DATASET_HOME
-            value: "/pfs/public/dataset"
+          - name: CURRENT_DATACENTER
+            value: "meiyan"
+        command: ["python", "-c", "\"import paddle.cloud.dataset.common as common; common.fetch_all()\""]
         volumeMounts:
         - name: data-storage
-          mountPath: /pfs/public
+          mountPath: /pfs/meiyan/public
       restartPolicy: Never
diff --git a/paddlecloud/paddlejob/paddle_job.py b/paddlecloud/paddlejob/paddle_job.py
index 836feff1..ecdb58c0 100644
--- a/paddlecloud/paddlejob/paddle_job.py
+++ b/paddlecloud/paddlejob/paddle_job.py
@@ -23,7 +23,8 @@ def __init__(self,
                  passes,
                  gpu=0,
                  volumes=[],
-                 registry_secret=None):
+                 registry_secret=None,
+                 envs = {}):
 
         self._ports_num=1
         self._ports_num_for_sparse=1
@@ -44,6 +45,7 @@ def __init__(self,
         self._volumes = volumes
         self._registry_secret = registry_secret
         self._passes = passes
+        self._usr_envs = envs
 
     @property
     def pservers(self):
@@ -86,6 +88,9 @@ def get_env(self):
             envs.append({"name":"PADDLE_INIT_USE_GPU", "value":str("0")})
         envs.append({"name":"NAMESPACE", "valueFrom":{
             "fieldRef":{"fieldPath":"metadata.namespace"}}})
+        if self._usr_envs:
+            for k, v in self._usr_envs.items():
+                envs.append({"name": k, "value": v})
         return envs
 
     def _get_pserver_container_ports(self):
diff --git a/paddlecloud/paddlejob/views.py b/paddlecloud/paddlejob/views.py
index 3c734f71..96a38244 100644
--- a/paddlecloud/paddlejob/views.py
+++ b/paddlecloud/paddlejob/views.py
@@ -116,6 +116,8 @@ def post(self, request, format=None):
                 mount_path = "/usr/local/nvidia/lib64",
                 host_path = settings.NVIDIA_LIB_PATH
             ))
+        envs = {}
+        envs.update({"PADDLE_CLOUD_CURRENT_DATACENTER": dc})
 
         paddle_job = PaddleJob(
             name = job_name,
@@ -132,7 +134,8 @@ def post(self, request, format=None):
             image = job_image,
             passes = obj.get("passes", 1),
             registry_secret = registry_secret,
-            volumes = volumes
+            volumes = volumes,
+            envs = envs
         )
         try:
             ret = client.ExtensionsV1beta1Api(api_client=api_client).create_namespaced_replica_set(