Some methods has been changed for refactor