[FEATURE] Builder update