Move extended data to a single object to prevent polymorphic code