Moving returning to the adapter and having it be a optional parameter