Feature/freetext state implementation