Change entities, rewrite accessors