Some activiti enhancements