Updated db entries file and fixed module mapper bug