Refactor: Integrate rework handles by application