More work on content from DB