add more domain POJOs
refine the log file naming