New simplified API with annotations.