Adding package file support