Added direct linking support