Added more function in propset.rs , few changes in data structs