Refactor for differences in client and server usage
Make the client initializer use referenceless objects for serializability