support for required, wait, fix for before