Update to new jasy template system