Add keywords to models, database, importer.

First part of implementation for #17