Added method wich gives array of all Modules + minor changes