CORE: modified class for performance measurement