Add support for {cursor} : attempt 2