Add better HD format support