Improved timing macro, added methods for it