Updated Framework to adjust class structure.