[TASK] Move 'defaultExtras' detection