Change implementation of Id; add Ordering