add context manager
done with data entity service