Added links processing when creating and removing