#cleanup - Broke Element, Elements inheritance and extract common parts to a module