Preparing code to Flow class change