Refactoring Ciana Provider/Panel models