Improving the syntax for the endpoint behaviours