Added xAPI support