Adding rest handler (experimental)