Only extend database when it is actually resolved.