Updated interfaces and configuration