Cleaned up interfaces for consistency with the SDD.