Minor commit with interface redesign