Prep work for akkamaddi

Work on support for akkamaddi addons