Add minimal support