Changed using statement to struct