Updated error format and started making more generic