added references to safemodel and modelfactory