Improved fromDatabase()