Switched to use utility versions of put and take
Removed nearly all references to abstract dataset