Added xpi for testing purposes