Refactor Frameworks to be more inline