BUG-865: do not use obsolete contructors

This removes the use of obsoleted constructors exposed from model API.

Change-Id: Ia537614855a7d4677bbb39b1d3bf9da984d23187
Signed-off-by: Robert Varga <rovarga@cisco.com>