Updated Detail Design Doc