Countinued to improve interfaces