Updated several files with methods