Remove the dependency of Arsenal.Entity