Preparing for possible future feature