Added demographic functionality to make things more dynamic