Added new modules in accordance with Milestone 3