Add some indexes and default values