Readded methods in Diaballik due to a bad commit