Added App and Plugin modules