Added package and package class requirements to avoid dependency errors