Fixes #332, #327 and remove model facade

Just wondering, what will happen to the deadline then?