Make things a little easier for autocomplete