Use config instead of hardcoded vals