Add Comments and access control