Model builder changes