Fixing relationship between Model and s/i/p classes.