Added log, improved interface (includes)