added manual instrumentation, aspectj and tracematches solution