Changed some methods and datatypes