Upgraded commons file