Added editors and error messages