annotations updated, preparation for kdyby/monolog