Add Houston / Apollo support