Added more files to framework