#103 Added some traces