Minor updates to the interface