Added resource rewind and fixed non resource body