Changed dataset name
Fixed dynamic properties bug