Refactoring Execution class