Updated with some modules