Added shares module and little refacto of common