AOP uses new collections on some places