Complete link parser
Added unit selection