Replaced RFC2554 with RFC4954 and split mechanisms into separate classes