Started to add log support