Updated constructor/properties to reflect correct class