Updated and added modules