Changes for activiti impl