Restructured pubdb.js