+common before and after function calls
Before and After handlers fix