Make use of newly added cursor functionality in default patterns