Changed cancelled and loaded concerns to gateway factory