Adding types and demo