Make these generic