Added simple package support