Fixing another interface vs. model issue