Added directive and activities list completely