Now with preliminary choreography support :)