Adding offlline support