Refactor table strategy