Updated builder design to match a few sorted out requirements.