Just to be sure: This isn't needed anymore because we have a value class now?