[TASK] Use more property injection in Flow core