Cleaning up interface to promote backwords compatibility.