Re-adding support for Phone numbers with refactored code