Jeremy Newman : adding data class and new plugins