Added JournalHandler and JournalType