Added new module
Fixed data