Fixing the Imagine model, it's not using any table.
Merge branch 'develop' into release/1.0.4