Added aop on components