Got entity parsing working