Refactor Mirage Class