Added O-scope captures

See my local commit.