Re-work for issue #2.

Prefixing model properties with underscore.