subject/sample/data management refectored