Started to add MonadPlus support