Added logic to filter out cn as a property