Added inner account linking (links dynamic to account type)