Serializable refactoring