Added structure for package