Updated according to the new modules created.