Added exceptions, workflow components