Small Changes in database wrapper.