Make interfaces fit current implementation