Proper entity lookup

Entities are lookup from context to session