Add methods and update