Added Distinct clause for NH queries + event listener on data annotations.