Adding <Using/> handling #1