Refactored References