Update the way we handle layers and links