Minor Changes to the Interface