Merging all architecture into supplied server --arch's if unspecified
Refactoring and cleaning up serialisation type classes