Added new decorator and cleaned up the try catch statements