Added blocks instead of selector/owner to resolve timing