Add some more logic for year born