Fix S2_MODEL constant
Use MODEL_TABLES constant
Use S2_MODELS constant