Working on database module