Updated Design doc