Added missing visibility attributes