Added package functionality & updated logging