Add support to build flow