Added specific graphs and error management