Add methods
Add parameters + untracted minor changes