Modules additions; other functions added