Add permissions, add annotations