Issue 17 entity storage