Adding basis for modules system
Added some small helper functions