service commit #2

small changes in serialization