Add automatic defaults fetching