Why are we only doing this for ```core``` objects?