Add birthDate support