Feature/#32 more sharing