improve definition resolver