Added public access stuff