Feature/reaper get improvements