revise the models due to ROR convention