Added ability to use other methods of serialization