Insert at-properties correctly