Finally fixed model build