Add support for multi-account and animated-gif