Added some traces