Added different master node template and TODO