dynamic data source change support added

Signed-off-by: nuwansa <nuwan077@gmail.com>