Now handling post as well