Added additional package structures