Improved data retrievel

Now easier to retrieve more data from the db, for storage in session