refactor and adding behavior :construction_worker: