Starting adding ENUM support