Refactor/array Added array notation to all modules