Have to swap for new fields and methods for correctness