TUP-2107 Refactor Updates

About the refactor updates, need merge and validate to master.