Restructuring/fit building params

Merge request reports