com build update for full build support