Xapi package improvements