Feature Enhancement: Address Enhancements