Fixes #332, #327 and remove model facade