Removed an unnecessary layer of monad. Users can add it in their types.