Improve entity adding so it gets appended nicely in general