Added check for missing types