Added missing definition checking