minor changes in common model