Updated Framework to reflect new recent changes.