Update defaults with custom environments in mind