added full datasets parsing