adding support for external activities and external assets