Removed use of generic types