Added activitylog support