Continue refactor implementing receiver table class