Added support for declarations and relations.