Added indexes to ensure our queries are using them