Change type to generic