Add indexes to tables
tighter validation on security active field