Little update of base module for shares