Updated model building module