More code refactoring. Separate gif_data