Refactored: Moved tables