Move to supporting virtual packages