Refactor raise