Removed dataset setter.
merge dev cahnges.