Added and Reorganized Framework