Fix common module for model