Added initial support for logging