LPS-45880 Add different notification bodys and modifiy handlers