Interface changes and improvements