Add sensors to spec draft
Merge syntax fixes in to wrapper spec