Add flatMap evaluation
Merge branch 'feature/flatmap' into feature/executor