Moved this stuff to Dataset in the last commit
Refactored and added #extract methods