Adding enterprise helper rewrite
Removing dependency to Aoe_Index