Moved scope to submission model