refactor for organ data manager