Modified CORE API
modified CORE API