Removing hardcoded configuration