Making package generic