Added modules loading