Title: Constructability improvement