added proper resolving of objects types, no unknown anymore or at least much less