added support of types of activities