CON-2249 | Better, smarter defaults