Moved persistence methods into separate Entity objects to account for Objectify restrictions