Updated properties to be inside constructor