Changed modules definition