Changes to the datastructure, added more permissions