I've simplified the annotations, so now I use the $value property