Updated with additional modules