Updates to interfaces and implementations