Migrated return values to use dataset interface
Updated some javadocs