refine Connection related classes