Updates to support hector side AOP.