Finish MAM returning implementation