Added logging and better examples