Done refactoring Framework