Multiple changes: logging, features to support plugins