Moved dictionary and definition definitions into xid structure