Added handling of empty type parameters