Replace 1.3 api with 2.0 layer. Make comparable with post