Minor interface changes before pull request