Upgraded version and keywords