Adjust to core interfaces