Add waEnter directive and prefix other directives
Add comments