Dataset template for initialization added. Small bug fixed.