support for before handlers with wait()
better and clean subscription handling