Update and optimize the CORE and add logging system