Improve entity instantiation performances