Moved grab list entities to separate namespace
Small TODO for future