Enchancements in buddy.xml according issue#3