Now with database-connection