Make API of ...Support modules more consistent

52049595 52049629