- fixes for model entity