Improve database; need intra-reference and expanded defs