added AOP in DB sense