Add current methods
Code cleaning