Decouple AgentManager
from serialization
#325
+48
−30
Merged