From EMPA to GSMPA: Allowing for General Distributions