Update to include entry id, proper use of token and proper data in comments push