Add mark/space support and traces