[modules] Add some more labels, fix method format