Added xstream, set buddy policy