Switched all links to contain system properties