Improvements in the fixtures models
Merge branch 'release/0.3.5'