Extracted AOP code into dedicated komponent.