Adjust code for HAL Core Console 1.6.0-SNAPSHOT