Added highlighting, return types