Entity map should not be static