Removed hacky handleConstruction method