JBTIS-102 - aop added