Replaced Class with Type