Updated Core files