[Refactoring] Remove Table from Target Selector