would be great to move this into a configuration option as you mentioned before