Better handling of exceptions
Work on workflows