Add more comment types