Use the new constants for submission contexts