Added stuff for level entity parsing
Merged