Use findDefinition instead of getDefinition && hasAlias