Reverting to previous version (solved serialization problem in a better way)