Handling for XEPs added