Add support for other program types