Adding Gif support