added resolving of models