Added concepts, removed FSA dependency