Fix #172 Replace Java annotations with Scala annotations