model interfaces fix