Update to support indexes on build