Moving push constants, adding proposed event types to deal with