Adding latest modifications for the 3.0 release. I noticed it really is too hard to create a generic structure to persist the data fetched from the database. I'll try to use strong-typed objects again, so the code will be easier to understand. We'll keep the generic datastructure for a later release.