Updated valdidation and work generatione errors