Organization and visibility are missing #313