Added logging, adding support for external items