Add multiple package support