Commit 2: Added modules