Slightly updated xpp template