Switch from using id to post_id