Add scopes and doc blocks for the class variables