Entity Answered added and integrated. todo: check oop schema