*reworked Common module