Moved versioned fields to versioning class