Refactored and expanded node interfaces