Issue #9 - entities are stripped on save to only necessary data