updated parsing method for tools
updated datasources for specs