Update Storage classes, add return statement.
Update controller exceptions
Update Dwoo files and plugins