Made sure interfaces were used in all cases.