Make stuff a little bit more restfully