[WIP] Changed build structor