Move method refactoring
Add foreign key reference extraction