- Made some methods more abstract