Adding usage annotations, round 1.