Fixed typo in metrics/tokens.
Added connectives support to database module.