added package support