Changed to have their properties in their own class
used reference class