Fixed: formats and references