Fix model interface