Added domains, types and resolve and a NotFoundError for resolve