Added more code to Database Fun module