Added support for resolving missing and unknown columns.