Post functionality improvment