Model: improve debugging clarity