Updated data types

Changed some member variables to pointers