Add local parameter to subscription method for local resources
Improve performance and correctness of activity creation