Added support for provided pub and sub