Added direct-only binding option
Moved binding info construction to helper (abstraction fix)