updates to type resolution