Added fields for entity queue
Merge branch 'feature/101'