Feature/jstrace