Updated build flow