Merge pull request #1 from mortenn/master

Some things I thought I'd change..
Merge pull request #2 from mortenn/master

Generify database row into data container
Avoid throwing exceptions trying to load metatable before it gets set up.