Fix the flatMap behaviour
Constrain the exports of Property