Add json serialisable support for model objects
Update ServiceConnector