Fixed snapshot component
Included definition builders for snapshot component