Fixed improper interfaces