Consolidated configs, adding config based functions