Added more sytax highlighting