Add better default int support