Refactoring + Dynamic processing added