Fixed package and added some keywords