Changed Age to BirthDate and more refactoring