Added missing definition checks