Updated several modules