Added link decoration, removed temporary info from schema