Resource model regression fixes

This PR brings fixes for some regression issues related to model parsing & referencing, namely:

- #195 
- #196 

In addition to model regression fixes this PR also fixes 

- #198