I avoided changing because de/serialization will change soon.