Added new functions/classes to highlighting