Updated methods
Added tables