Add support for different types demoing in future, display types and demo link