Added fedmsg support propoerly