Added default values for production so it won't crash with 500