upgrade to new Commons API