Added <*package> and </package> to output