Normalised ID and moved that into a common trait