Updated demographics support