Added some log support