Working on models coverage