Improved comment types