Adding support for build flow