fixes #21: Use annotations