Bugfixed model interface and implementation