Even more interface updates