Adds some improvements to the way we access the data stored on the
objects, always use the definitive id regardless of required or not