Add cornerstone and discovery