Module support updated