updates to support jackson 2.1.1