adding new rest modules and begin handling exception in rest mode