Updates for validation against unique and uniqueOrNull