Added retrieve to database handler