Improve registration & log process