Improved the raise class