Add more schema info to entity in graph view

Refactored a lot