Fixed SFEntity to allow for merging