Adding serialization helper and modifying wrappers so they contain Serializables