Use more generic types