Removed duplicate definition of payload types, made exchange type an Enum